Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Tue, 7 Apr 2009 16:05:03 +0000 (18:05 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 7 Apr 2009 16:05:03 +0000 (18:05 +0200)

Trivial merge